Fixed Logo Problem and some minor bug