styling buttons, added spinner
merged