extra code removed from controller, links to picture change added, minor bugs fixed