Got Layout Working

Pushing before integrating.