UI polish, logic debugging