Merging MainActivity. Working with Actor Browsing - not working at the moment.
Fixed merge conflict