Refactor, fix bugs, add landing page