Implement new forms layout