updates of views and features
Merge pull request #71 from TCPA/feature/sprint1

updates of views and features