some improvments in UI