Fixed the Layout files. Yikes...
Fixed the Layout files. Yikes... #2
Removed imports that aren't needed.
Merge pull request #3 from budsmile/master

Fixed the layout files