Added and fixed for jonathan
Merge pull request #5 from Death-Star/layout

Added and fixed for jonathan