added picture resources
lots of fixes to UI
merge