Initial commit for final UI changes