Refactoring, Flexification and CSS (I need to merge after each new feature... )