UI edits, minor code prettying