Refactoring
UI design, making it good enough on both Note II and Xperia Ray