Get rid of affix
Work on layout and css stuff