Update: Re-Design UI