did some debugging, fixed some stuff, changed UI layout (Grid->Table)