some bugs fixes and view progression