Updated layout after first review