Last updates to styling (hopefully)