Better use of space and media queries added