BUG FIxes ToMAke it ALl BeaUitiful