Style updates

Some new style updates, still buggy