markup cleanup, add visual selected class
Update markup