updated view and ui more