Further UI/style changes