added pictures and more functionality