Improve layout, so user's custom assets are included