Made further additions to the code base on viewing and management UIs