styling and behaviour update