Design tweaks 2 55885674