fixed allignment of listview in main screen
fixing conflicting merges