Added user edit and picture upload #4