Refactoring; context navs added; version 0.3.1