layout problems fixed - report code added