General refactoring and media query @ min-width 768