Added visual enchancements