[Adam] more UI polish