Cleaned up
Tried Animations with Angular, didnt look good