Improved command button colours & layout