updated layout and angular scaffold