add layouts if not there, restructure views, update to latest eggs