Slightly updated layout and corrected lint errors

I made some minor modifications to the layout to make the screen match the "ok glass" screen a little better.  It is still not perfect, but it provides a slightly more consistent look.

I also fixed some Lint errors related to resources.