Some bugs fixed
User button fixed