Reworked Layout and styles