Small changes for ui