Fixed UI formatting and compliance