Committing icons
fixed framework bugs
Merge pull request #2 from jwinskill/Layout

Committing icons