removed last ui bugs and some others