Tweaked appearance and bug fixed