Some small changes to use @media queries to serve the right width of layout