Minor changes - error/success message placement