Remove Selmer dependency
Split validation functions, start building layout