User interface and code improvements