More tweaking of the layout - ready to transfer to the prod one