bug fixed & css improvements