fix new folder and ok buttons
code cleanup
Merge branch 'fc' into fc-ics