added some layout fixes