Fixed content layout and design, created CSS media player

Conflicts:
style.css