Redesigned the appearance of main activity
+Some cleaning