bad changes
fix conflict
add buttons
little styling
fix conflict