Working first view just some steps left to finish

Change-Id: I74b6a939c3a597504d83962bed1a751f180fab7e