Slight remodel and more GUI work