Bug fixes on UI