Updated form loading