change add button size and cleanup templates