Started arranging content, more design optimizations, added new media query
Merge remote-tracking branch 'origin/master'