Styled UI, improved JS/Angular code