Yeah, Sam should probably have a look at this. It still feels like some sort of collapsable menu would be the best solution.