Major Refactor, Relayout, remove lab42 deps, fix style issues