UI Revision and Implementation