UI errors fixed