Improve UI globally
Remove unused file