Layout and styles updated