fixed bugs, added CSS