[FJJ] - Adjust UI