Clean up and small display tweeks