Need to fix format text and extra UI