some bug fixing/css tweaking