Change size, layout of components. Fix bugs in validation

fning