Adjusted margins/added table and form