Fixed some visual bugs #18,#7