[BUGFIX] Add Default Layout
Followup to f22e84f