refactor layout
style refactor
refactor title
add new layout