Added Modal view
Fixed navigation buttons