I5: Refactors Idea
I6: adds layout