bug fixed, look and feel