Adding a bunch of stuff to fix the layouts and views because I add too much at once.