Merge branch 'development'
layout for desktop fix
layout coloring on sidebar
Merge branch '5_updated_layout' into development