[#189] clean up and restructure

* some modifications to incorporate Loïc's UI code
* introduces three column - navigation