added some tests and some layout things