restructured app layout in preparation of auth