Fixed previous bugs. New bugs - Buttons not working.