Move Add Item into separate view; improve design