updated layouts and related code.

added a new 'discovering' view.