Quanitity and some other minor UI features