Bug Fixes and CSS Issues