added: todo's
changed: layout to a table