Tons of layout updates to accommodate for responsivenes