fixed a picture display bug and changed some templates