Improved UI elements of index