Working on academic class elements

Also solved the issue which allowed the user to scroll off the side of
the page.