After testing modified code and UI modifications
After testing modified code and design..