Updated layout for Angular