Fix broken status view and minor bug