[FEATURE] Removed unwanted headings, cleaned up UI