removed extra package
now with add/view screen to start
Fixing merge issues