Change home to back
Remove TODO comment
Merge branch 'feature/issue-14-change-home-to-back-for-milestone' into develop