minor bug fixes
added UI part for grace period