Adding some more orginisational detail
View-panel handling is not great