Some small UI improvments and textual changes