Upgrades

Upgrades + some style