whitespace nits
fix tap on contact issue
migrate HomeScreen app to marionette By