Fixed highlighting, expanded area, started S1 GUI