Added AngularLayout
And more missing things