some refactoring and edited views