Updated angular code + some UI