Fix changing of the layout to soon
Add better solution for specific bootstrap and init