Completed StatementPanel

Also some tidying up