more front end, login, dashboard, some others
trying to fix merge