Bug Fixes & CSS