Reworked some classes trying to implement MVC. Everything (except photo's) seems to work.