Final Functional Build. UI changes ONLY