Front-End Design Fix