Added buttons and basic styling
Fixed merge conflict