Add Status View and some other minor changes