major layout changes
Merge pull request #5 from 2010-DEV-SR-0/dev

major layout changes