Updated Main Form