Finished style, added Angular functionality