Fix UI related issues