cleaned up container divs
Added selection highlights