Separated layout
Updated layouts based on queries of width