Resolved UI issues