Minor layout changes, padding added