Moving application creation to module function
Adding map controls