further progress in cleanup and customization of view
ageobab wack commit fix