pushing new changes to fix angular functionality and some styling