Fixing alignment of buttons and spacing