Improve buttons. Still need to fix for active items