Initial implementation of side menu navigation
Bug fixes, code refactor