Last bit of margin changes for now. Looks much better.