Restyle and added functionality