Removed unused code and added more tabs to the UI