UI & Manual Solution Completed