added styles for buttons, added button section
fixed merge conflicts