UI improvements, some bug were fixed