Changes layout and color scheme for imporved UI/UX
Merge branch 'nickUIUXImprovements' into dev