Spot rm

To be honest only the first commit is necessary for making the tabbed properties work.