merges and layout fixes