Interest form standardization

Standardized and improved appearance of both interest forms, as well as
some minor code refactoring