Issue #425 - Revamp Design and fix flickering on live data refresh