Replaced background video to background image, will
look into it again later
Resolve merge conflicts, cleaned up nav html