separated detail view in separate view + cleanup of code