Refactoring HTML/CSS 90% , need changed interface