Bug fixes, and cssing