Add button fixed. Extracted repeatable views in a class file.