Clean up detail view and make navigation better