Added angular aspects and further messed with css