Restyle and add code