Final changes in ui