Reworked a vast majority of the crud layout.