Viewer / Builder complete and imports fixed