switched to angular, changed layout