Apply settings desing improvements