bug fix and UI impruvements