Code cleanup
Hide view only if is visible
Merge branch 'master' into feature/animations