Finish UI redesign