fixed some UI functionatily