Code and User interface improvement