fix layouts and asset loading