Move more options to base type extension
* Add checks for horizontal and inline forms to templates