Fixes

Some changes to visual components.