Constraints update
Added buttons templates