Small changes for ui and usability