Improved main presenter ; Added more tests ; Improved model layer