Some bug Fixed and do some CSS
Merge branch 'dev'