Rewrote frontend playing with some angular