tidied up userpane