cleanup + make buttons bigger