More menus working.
Disconnect and connect bugs solved.
Merge branch 'master' of https://github.com/xistoso/AquaplantX