Merge pull request #5 from freddylimpens/master

isotope fix + editing mode
refactor and home page
merged latest refactoring with small fixes