Layout fixes

Fixed padding and margin issues on template