Everything looks good except the space for the goldfish. Goldfish are really pond fish and do better with about ten gallons per fish.
Thanks for the comment! The goldfish is temporary, he was getting beat up by my other fish, so I put him in there to recover before he goes to my sisters pond.I'll move my betta fish in there once the goldfish is good to go.