Update layout and make angular controllers