Finally done with the layouts, they are working fine, I wont deploy this yet since the changes I made affect the other services as well, I will go over them in the morning with the team and see if they like them, otherwise I will revert for the presentation of the evening.