Cleaned up the .kv a bit