Few layout fixes