Visual and programatic tweaks