Bug fixes; added overlay view contorller