logics fin
look and feel
refactor