UI updates
Merged UI code into correct Rails locations