#Issue 170 Modifying androidlayout and userController