Fix Some CSS and more options