design + users almost finished
after merge dmitry->master