Develop - Views refactoring

Complete refactoring of AR views.