Formatting clean-up, small layout fixes

Took out un-needed blank lines throughout the code to make it more
readable. Also there were small tweaks to the layout files and removal
of unneeded drawables.