fix views and change order states