CSS fixes & d&d