Fixing some button stuff