fixed layout bugs
Merge branch 'master' of github.com:passivoice/tool_library into images