More changes for looking nicer and stuff