Refactoring Forms to be more platform neutral