Remove unneeded buttons
More content, style tweaks