Cleaned up submodules
Fixed issues preventing use of octopanel