cleanup and fix display inline