Remove unused file
Improve UI globally