some fixes
Merge pull request #1 from enpere/refactor-view

some fixes