Almost done V1 styling