layout fix
stylin
resolved conflicts