HTML & CSS cleanup

Just some organization and cleanup of markup files