Fix #10 and some layout fixes