Mass Changes

Scrapped a whole lot of unnecessary things and updated some layout
issues.