less fix and some stupid css code
fixed conflict