restructure app layout