Fixes #292.
tweak layout and logic
sipmlify CSS