Add button and form control styles
Style tweaks