fixed UI and angular architecture!!!!!!