Added UI functionality