fixed some id issues and moved SKTShifts to internal.
cleanup and UI optimization.