Code clean, remove unused class
Improve Settings popup layout