Added more viusal goodies