Move layout from app to MainBundle