UI Rework - Material Design