updated map buttons
views refactoring
controllers refactoring
models refactoring