Added UI improvements