Change the layout to support pure AngularJS for frontend