further progress in cleanup and customization of view