More styling/functionality changes