Cleaned up UI causing the removal of some elements which will be implemented in the next commit.