Fixed bugs and added Images