Fixed minor issues and added background activity