Functional fixes/cleanup

`<a button` should not include button