Giant refactor, advanced render for waila