CleanUp old xmls, refractor Main Activity