Tidied up panel add/remove