Refactored view names. More details on status page