performance fixes
updated like buttons