Visual upgrades, added class constructor