Styled the buttons at the top
Hopefully the merge issues are over