modify category logic and modify login page