Added a decent property display panel.
Rough merge