Fixed some visual layout