updated UI layout, finish UI pattern