Quick UI redesign & re-styling