Fixed padding amnd margins problems