overhaul?

removed excess + actual buttons :]