Added missing index
Ui fixes and improvements