Refactor status views and templates