Padding, style and button changes