Some layout fixes and some commit ones