Added UI support for the application