Add status view and better flow