Added UI features