#836 Small design update