Some changes for ui have been made