Main activity and small UI changes
Main activity and small UI changes