refactoring + added browser launch

Change-Id: I9564a8c56366cb1c32ffe269d605440ba8585fbe