Bsongis/taranis+ lcd refactoring