UI Updates

Camera fix is included with this pull request.