fix title
fix layout
fix comflict