Conflicts handling - merge with major UI branch
Code cleanup, link to home page fixed.