Fixes to form to work with theme