Made tree remember its expansion state when changing the filters
Tidied up layout