Fixed UI related issues