Minor cleanup items for developer screen
Merge pull request #1110 from garvankeeley/cleanup-dev-screen

Minor cleanup items for developer screen