more @media, edited content, final commit