added image menu; bit of restructuring