Re-added buttons. Still need menu fix.