Updated base layout for new design & Angular 1.2.0rc2