Minor layout fixes for defence