Cleaning up some more terrible code/layouts.