Added UI and functional features