Fixed some problems with padding

The entire padding system needs to be redone (and re thought) entirely.
Its working but requires various hacks and such to make it work
properly. Simply not correct.