Fixed a couple things, broke a couple others
Started trying to fix the padding problem. Made it slightly less hideous.