bug 1122: layout change
bug 1130: adjusted link path to images
bug 1009: adjusted links to images
Merge branch 'bug-1009' into testserver-stable
Merge branch 'bug-1130' into testserver-stable
Merge branch 'bug-1122' into testserver-stable