Added zipped angular, add modal window. Refactor code.