Index improvements
Begin GUI work