Add more UI classes