Fixes and tabs

Fix https://github.com/Open-Code-Developers/BoatCraft/issues/229 , fix
https://github.com/Open-Code-Developers/BoatCraft/issues/228 , and fix
https://github.com/Open-Code-Developers/BoatCraft/issues/227 .