Improved styling of Group label
Added an error handler