UI Issues Bug Fixing