Fix lag issue when redrawing the UI after a merge
Fix typos
Fix account model that was copied incorrectly before
Merge pull request #7 from ericmasiello/develop

develop