Some minor changes to improve the look the feel