Fixed some commented issues on PR and cleaned up css for shifts modal closes #1163.