Major updates to styling