Started adapting the normal-layout to the styles