Fix some visual bugs