Revert "Did some more changes on UI pages"

This reverts commit d4be170f6c4250e64a4fd70b8fa166c8f18e4a78.
Reverting my changes