improvements

Visual and code improvements.
improvements