Some bug Fixed and do some CSS