Some UI upgrades
Better UI, going to sleep now