Appropriately-sized buttons, bugs removed