Add new separated adapter and layout