more ui changes and some picture support