Revert "Revert "changing view""

This reverts commit 9a0cb9125e1c379f01985020f56457c74c9e5fe0.
Fixing broken ui: