Added in removal from the panlist as well as final tweaks