more cleanup, especially HTML, start to pull declarative dijits into programmatic