applying UI to most of the classes
fix conflict