Major refactor and visual overhaul