Main Activity improved