Fixing UI formatting issues