Fixed a few minor things.
Removed bad layout file.