Refactored forms to get consistent UI, added dir for links