tweak layout and logic
sipmlify CSS