integrated basic css and bug fixes