Updates and style changes