moved buttons to helpers, started normalize cleanup