more fixes

fixes and issues ( UI )
more fixes (UI )