Fixed UI formatting issues