Main activity fix