Change from static html to MAKO templates
Corrections made
Menu changed
Merge pull request #7 from kchomski/bug_790

Bug 790