fixes bugs, adds some css