Bug fixes & css changes