Fixed keyboard issues and animation