fixed iteration and layout problems.
Merge branch 'master' of https://github.com/Botkilla2k12/se262project